merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 15 Dec 2011 01:52:31 +0000 (10:52 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 15 Dec 2011 01:52:31 +0000 (10:52 +0900)
commit6db5d670724c60329e338c0c91cd1adc3532736f
treea3748510d223b60635087e9e49f8793f5efa15b3
parentd679f729396a43f2be2267d5bda3a86cf644fec0
parente06adf5fe028afd87b59dc2f7678f2554889ba38
merge trunk